From c0d9c5e627c94e1712cd19a92e1e3c4d39efcae8 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Sun, 24 Oct 2010 13:15:48 +0100 Subject: [PATCH] x86: delete not really used ioapic_renumber_irq variable Signed-off-by: Jan Beulich --- xen/arch/x86/io_apic.c | 8 -------- xen/arch/x86/mpparse.c | 3 --- xen/include/asm-x86/io_apic.h | 1 - 3 files changed, 12 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 3097fac3ff..30552e2ac8 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -38,7 +38,6 @@ #include #include -int (*ioapic_renumber_irq)(int ioapic, int irq); atomic_t irq_mis_count; /* Where if anywhere is the i8259 connect in external int mode */ @@ -877,13 +876,6 @@ static int pin_2_irq(int idx, int apic, int pin) while (i < apic) irq += nr_ioapic_registers[i++]; irq += pin; - - /* - * For MPS mode, so far only needed by ES7000 platform - */ - if (ioapic_renumber_irq) - irq = ioapic_renumber_irq(apic, irq); - break; } default: diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index fe5bdaa7f6..2a41df8535 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -1116,9 +1116,6 @@ int mp_register_gsi (u32 gsi, int triggering, int polarity) ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base; - if (ioapic_renumber_irq) - gsi = ioapic_renumber_irq(ioapic, gsi); - desc = irq_to_desc(gsi); spin_lock_irqsave(&desc->lock, flags); if (!(desc->status & IRQ_DISABLED) && desc->handler != &no_irq_type) { diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index 7d577f39d6..fcbb557325 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -195,7 +195,6 @@ extern int timer_uses_ioapic_pin_0; extern void init_ioapic_mappings(void); -extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern void ioapic_suspend(void); extern void ioapic_resume(void); -- 2.30.2